projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ed4ec8 97a265d)
bitkeeper revision 1.1064 (40f28b086ejGbsgwP7ea5F9nKNXIxA)
authormwilli2@equilibrium.research.intel-research.net <mwilli2@equilibrium.research.intel-research.net>
Mon, 12 Jul 2004 12:58:48 +0000 (12:58 +0000)
committermwilli2@equilibrium.research.intel-research.net <mwilli2@equilibrium.research.intel-research.net>
Mon, 12 Jul 2004 12:58:48 +0000 (12:58 +0000)
Merge ssh://srg//auto/groups/xeno/BK/xeno.bk
into equilibrium.research.intel-research.net:/export/scratch/mwilli2/temp/xeno2.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
tools/python/xen/xm/main.py patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc tools/python/xen/xm/main.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.